From 913d6c8061cb566027313534f1649ac574c1283b Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Wed, 13 Aug 2014 16:19:14 +0200
Subject: [PATCH] Adwaita: saner menubar

---
 gtk/resources/theme/Adwaita/_common.scss           | 9 +++++----
 gtk/resources/theme/Adwaita/gtk-contained-dark.css | 8 +++-----
 gtk/resources/theme/Adwaita/gtk-contained.css      | 6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 9a7d3148b9..c0699ea547 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1094,13 +1094,14 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
  *********/
 .menubar {
   padding: 0px;
-  background-color: mix($fg_color,$bg_color,5%); //Uhm?
+  box-shadow: inset 0 -1px transparentize(black, 0.9);
   &:backdrop { background-color: $backdrop_bg_color; }
   & > .menuitem {
     padding: 4px 8px;
     &:hover { //Seems like it :hover even with keyboard focus
       box-shadow: inset 0 -3px $selected_bg_color;
-      color: $selected_bg_color;
+      color: if($variant == 'light', $selected_bg_color,
+                                     lighten($selected_bg_color,15%));
     }
     &:insensitive {
       color: $insensitive_fg_color;
@@ -2161,8 +2162,8 @@ GtkScrolledWindow {
   background-image: linear-gradient(to bottom, mix(black, $bg_color, 6%) 5%,
                               mix(black, $bg_color, 4%));
   // FIXME no space for outer shadow : box-shadow: 0 1px 1px rgba(0,0,0,.5);
-  padding: 0 4px;
-  .button { padding: 6px; }
+  padding: 4px;
+ // .button { padding: 6px; }
 }
 
 /*************
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 791ba9e562..03ff51bad7 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1182,14 +1182,14 @@ GtkTreeView.view.progressbar {
  *********/
 .menubar {
   padding: 0px;
-  background-color: #424747; }
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); }
   .menubar:backdrop {
     background-color: #393f3f; }
   .menubar > .menuitem {
     padding: 4px 8px; }
     .menubar > .menuitem:hover {
       box-shadow: inset 0 -3px #215d9c;
-      color: #215d9c; }
+      color: #3583d5; }
     .menubar > .menuitem:insensitive {
       color: #939695;
       box-shadow: none; }
@@ -2590,9 +2590,7 @@ GtkScrolledWindow GtkViewport.frame {
   border-color: #1c1f1f;
   border-radius: 0 0 6px 6px;
   background-image: linear-gradient(to bottom, #353b3b 5%, #363c3c);
-  padding: 0 4px; }
-  .app-notification .button {
-    padding: 6px; }
+  padding: 4px; }
 
 /*************
  * Expanders *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index e023e81475..32a30fb38b 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1176,7 +1176,7 @@ GtkTreeView.view.progressbar {
  *********/
 .menubar {
   padding: 0px;
-  background-color: #e3e3e3; }
+  box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1); }
   .menubar:backdrop {
     background-color: #ededed; }
   .menubar > .menuitem {
@@ -2585,9 +2585,7 @@ GtkScrolledWindow GtkViewport.frame {
   border-color: #a1a1a1;
   border-radius: 0 0 6px 6px;
   background-image: linear-gradient(to bottom, #dedede 5%, #e3e3e3);
-  padding: 0 4px; }
-  .app-notification .button {
-    padding: 6px; }
+  padding: 4px; }
 
 /*************
  * Expanders *
-- 
2.30.2